From: Wei Liu <wei.liu2@citrix.com>
Date: Sun, 6 Sep 2015 20:05:36 +0000 (+0100)
Subject: libxc: migration v2 prefix Memory -> Frames
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~2585
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=76d75222aa0cb4838695e7f8051f098cf9906c45;p=xen.git

libxc: migration v2 prefix Memory -> Frames

The prefix "Memory" is confusing because the numbers shown after that
are referring to frames.

Change a bunch of prefixes from "Memory" to "Frames". Also rename
send_memory_verify to verify_frames.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c
index 58667afb9d..7dc3a48ccb 100644
--- a/tools/libxc/xc_sr_save.c
+++ b/tools/libxc/xc_sr_save.c
@@ -451,7 +451,7 @@ static int update_progress_string(struct xc_sr_context *ctx,
     xc_interface *xch = ctx->xch;
     char *new_str = NULL;
 
-    if ( asprintf(&new_str, "Memory iteration %u of %u",
+    if ( asprintf(&new_str, "Frames iteration %u of %u",
                   iter, ctx->save.max_iterations) == -1 )
     {
         PERROR("Unable to allocate new progress string");
@@ -569,7 +569,7 @@ static int suspend_and_send_dirty(struct xc_sr_context *ctx)
     return rc;
 }
 
-static int send_memory_verify(struct xc_sr_context *ctx)
+static int verify_frames(struct xc_sr_context *ctx)
 {
     xc_interface *xch = ctx->xch;
     xc_shadow_op_stats_t stats = { 0, ctx->save.p2m_size };
@@ -586,7 +586,7 @@ static int send_memory_verify(struct xc_sr_context *ctx)
     if ( rc )
         goto out;
 
-    xc_set_progress_prefix(xch, "Memory verify");
+    xc_set_progress_prefix(xch, "Frames verify");
     rc = send_all_pages(ctx);
     if ( rc )
         goto out;
@@ -629,7 +629,7 @@ static int send_domain_memory_live(struct xc_sr_context *ctx)
 
     if ( ctx->save.debug && !ctx->save.checkpointed )
     {
-        rc = send_memory_verify(ctx);
+        rc = verify_frames(ctx);
         if ( rc )
             goto out;
     }
@@ -659,7 +659,7 @@ static int send_domain_memory_nonlive(struct xc_sr_context *ctx)
     if ( rc )
         goto err;
 
-    xc_set_progress_prefix(xch, "Memory");
+    xc_set_progress_prefix(xch, "Frames");
 
     rc = send_all_pages(ctx);
     if ( rc )